22659c
@@ -385,6 +385,9 @@
public VectorPartitionContext createAndInitPartitionContext(PartitionDesc partDe
           throws SerDeException, Exception {
 
     VectorPartitionDesc vectorPartDesc = partDesc.getVectorPartitionDesc();
+    if (vectorPartDesc == null) {
+      return null;
+    }
     VectorPartitionContext vectorPartitionContext;
     VectorMapOperatorReadType vectorMapOperatorReadType =
         vectorPartDesc.getVectorMapOperatorReadType();
@@ -631,6 +634,10 @@
private void setRowIdentiferToNull(VectorizedRowBatch batch) {
   private void setupPartitionContextVars(String nominalPath) throws HiveException {
 
     currentVectorPartContext = fileToPartitionContextMap.get(nominalPath);
+    if (currentVectorPartContext == null) {
+      return;
+    }
+
     PartitionDesc partDesc = currentVectorPartContext.getPartDesc();
     VectorPartitionDesc vectorPartDesc = partDesc.getVectorPartitionDesc();
     currentReadType = vectorPartDesc.getVectorMapOperatorReadType();
